merge trunk
authorKenichi Handa <handa@etlken>
Wed, 30 Jun 2010 06:51:39 +0000 (15:51 +0900)
committerKenichi Handa <handa@etlken>
Wed, 30 Jun 2010 06:51:39 +0000 (15:51 +0900)

Trivial merge